From 133c2fcbb23da9fa621e90512ce8017edebb3892 Mon Sep 17 00:00:00 2001 From: Greg Sabino Mullane Date: Wed, 30 Apr 2008 14:36:06 +0000 Subject: [PATCH] Call useIndexClause, not raw FORCE INDEX. --- includes/SpecialListusers.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/includes/SpecialListusers.php b/includes/SpecialListusers.php index 6d32f9a373..8d99cf21a4 100644 --- a/includes/SpecialListusers.php +++ b/includes/SpecialListusers.php @@ -56,6 +56,7 @@ class UsersPager extends AlphabeticPager { } function getQueryInfo() { + $dbr = wfGetDB( DB_SLAVE ); $conds=array(); // don't show hidden names $conds[]='ipb_deleted IS NULL OR ipb_deleted = 0'; @@ -63,13 +64,13 @@ class UsersPager extends AlphabeticPager { $conds['ug_group'] = $this->requestedGroup; $useIndex = ''; } else { - $useIndex = 'FORCE INDEX (user_name)'; + $useIndex = $dbr->useIndexClause('user_name'); } if ($this->requestedUser != "") { - $conds[] = 'user_name >= ' . wfGetDB()->addQuotes( $this->requestedUser ); + $conds[] = 'user_name >= ' . $dbr->addQuotes( $this->requestedUser ); } - list ($user,$user_groups,$ipblocks) = wfGetDB()->tableNamesN('user','user_groups','ipblocks'); + list ($user,$user_groups,$ipblocks) = $dbr->tableNamesN('user','user_groups','ipblocks'); $query = array( 'tables' => " $user $useIndex LEFT JOIN $user_groups ON user_id=ug_user -- 2.20.1